auto upstream
authorJoakim Verona <joakim@verona.se>
Wed, 12 Dec 2012 22:46:55 +0000 (23:46 +0100)
committerJoakim Verona <joakim@verona.se>
Wed, 12 Dec 2012 22:46:55 +0000 (23:46 +0100)

Trivial merge